includes fixing commit 1ac2f407 BUG: 314409 REVIEW: 108775 FIXED-IN: 4.10.1 (cherry picked from commit e4ef2f07)