By Killyana, closes #4522 (cherry picked from commit 1f9e0531a14ad95edc05a0db27a541ff9c7691a2)
hotfixes