By Killyana, closes #12518 (cherry picked from commit 61c482b9d36a0556b2a43dae18ae21fafba5c2ac)
hotfixes