By Killyana, closes #4167 (cherry picked from commit ba4614543cc5d7b548cf342149d2d86cd95f8dc2)
hotfixes