Fix for issue #28214 (3.x)