Props dlh, munyagu, rishishah. Merges [42568] to the 4.9 branch. Fixes #42565. Built from https://develop.svn.wordpress.org/branches/4.9@42569 git-svn-id: http://core.svn.wordpress.org/branches/4.9@42398 1a063a9b-81f0-0310-95a4-ce76da25c4cd