By @Saben65 Closes #16104 (cherry picked from commit 17b57453c1082659f28f2bf3d20678f842f9c953)
hotfixes