By Killyana, closes #12564 (cherry picked from commit 15492ecaf2fac0a29b015f51b3ca579d4000f97e)
hotfixes