By @sirikfoll Closes #16235 (cherry picked from commit 8f71950c910ebf76b1335d710f2ec584aaa58fca)
hotfixes