By malcrom, updated by Killyana closes #6606 (cherry picked from commit 188f19f1c526d629960a97335786d05fec7a225d)
hotfixes