By SnapperRy Closes #17495 (cherry picked from commit e5fefebfc3848e11f171b3720385708115b4c222)
hotfixes