By Killyana, closes #12616 (cherry picked from commit 28ef8431ee5091da638d5bcd333629cb0b342213)
hotfixes