By @tkrokli Closes #16323 (cherry picked from commit e9ed9f80db703e631e5ce1a1cfb882f30854d3f5)
hotfixes