Folowup patch for Bug 979696
Merge pull request #16918 from pivanov/bug-979696

Folowup patch for Bug 979696