Closes #17454 by SnapperRy (cherry picked from commit 4519be74a263acd17242fb4558b2bb3194c151a6)
hotfixes