By Killyana, closes #10972 (cherry picked from commit f49c77aba74922506f035814841f72a93610440d)
hotfixes