By @tkrokli Closes #16078 (cherry picked from commit 99f31a2202564493751240d99e08e1044c7a9d80)
hotfixes