Closes #17371 by SnapperRy (cherry picked from commit a307157dac691f8b98c80f32993601ceb6739fc2)
hotfixes