Merged thread with #14401.
(Hopefully I did it the right way)