By SnapperRy Closes #17497 (cherry picked from commit f6aa2ca08602c9acd838a96792175955abeba6fd)
hotfixes