By SnapperRy Closes #17502 (cherry picked from commit 4d6eed380fb924295c5ff9293d70f605bc868604)
hotfixes