By Killyana, closes #10389 (cherry picked from commit 8a54cc043b018ff8f3c849a48d347862cd03f3fc)
hotfixes