By tkrokli closes #16648 (cherry picked from commit 7ee7548b9443c16d3fe01d4c95493d250b7efd9b)
hotfixes