Synchronization and behavior separation

Also adapting for latest changes in master

Author: pitr-ch