Thanks to Sirikfoll, Krudor and Offl for all help (cherry picked from commit 5af1fa22733c64e97f60967b36ea970a355d0598)
hotfixes