Created by: clusterfack
Fixes #9851 (closed) Fixes #9860 (closed) Fixes #9757 (closed) Fixes #9751 (closed)