Merge branch 'master' into sync_interface
Support for various SyncCommand formats
Merge branch 'sync_interface'