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