SyncOMatic update

Syncing with the Develop-2.0RC branch