By Killyana, closes #10309 (cherry picked from commit 5ac2f87c1400f004d6e2ed162512c85e6f1ed860)
hotfixes