By Killyana, closes #4214 (cherry picked from commit b495b0f0b4e9bd7e62eeba70d5f0e11638123aa0)
hotfixes