revert
Revert "revert"

This reverts commit e083ebc600bfc4e3362aeccc2411ed19759e2843.
Indev 0.03.01027

Bugfixes