backport change from trunk
1 file changed