By Killyana, closes #12615 (cherry picked from commit 82664273cc472e2c88a7883cab895f0fe3212569)
hotfixes