By Killyana, closes #7019 (cherry picked from commit 2b95a5fe3562264f52f1ca9296faf411a90d5d8d)
hotfixes