SyncOMatic update

Syncing the 2.0RC branch with master repo. 
(Work in progress)