Backport revision 186252 to 4.7 branch