Merge changes from 59576 from trunk to p3yk branch; these were skipped
in the regular merge.  Fixes issue #1693.
1 file changed