There are now 3 different bug reports this PR will fix, so I'm a strong proponent of merging this without a test, so we can get it into the next pre-release. Test can always be added in a follow up
Originally posted by @davidwengier in #79844 (comment)