Follow-up to [48039], [48283], [48749], [48757], [48758]. This brings the changes to the 5.5 branch. Props TimothyBlynJacobs, SergeyBiryukov, whyisjake. Fixes #37011. git-svn-id: https://develop.svn.wordpress.org/branches/5.5@48759 602fd350-edb4-49c9-b593-d223f7449a82