By tkrokli, closes #15725 (cherry picked from commit 09b15428bc8854bd388d689e8ccf3ae9f9903d67)
hotfixes