By SnapperRy Closes #17490 (cherry picked from commit 0566bba3356470d0564e39ee971b1a53c50351a4)
hotfixes