Dev Sync (18)

Bugfixes