By tkrokli, closes #15304. (cherry picked from commit ec4c4327bfb24f650dc72ee2d3df2e1a7376ee4a)
hotfixes