Closes #28751 (closed)
(doesn't need porting to v5, as there the issue doesn't appear to be present anymore)