By SnapperRy Closes #17494 (cherry picked from commit 1b1348fca637c26ba209789ed5b9d06ab232288c)
hotfixes