By Killyana, closes #4532 (cherry picked from commit 84e51319a6e344683252bc6261c25fc312ecbf4e)
hotfixes