Backport revision 205532 from trunk