By gecko32, closes #3214 (cherry picked from commit 78d2f934b99d2e92d28648a4f12dcb47767d43db)
hotfixes