(cherry-picked from 0cdec797de23555c95a70978f4d9e06f3b041330)

Ref chromium issue 378607
Ref #14839
Closes gh-1662