By SnapperRy Closes #17500 #10599 (cherry picked from commit 0aa2f74eece59789368174bb6277354c8de9d1da)
hotfixes