Merges [60815] and [60816] to the 6.8 branch. Props audrasjb, desrosj, johnbillion, jorbin, phillsav, vortfu, westonruter Built from https://develop.svn.wordpress.org/branches/6.8@60818 git-svn-id: http://core.svn.wordpress.org/branches/6.8@60154 1a063a9b-81f0-0310-95a4-ce76da25c4cd