By Fearless18, closes #5208 (cherry picked from commit de4043097e31d7ba968425f0a2ec55a9a1e5b117)
hotfixes