By Killyana, closes #12711 (cherry picked from commit 291fc4d591f828f11268bce9817b28fa7fbef609)
hotfixes