Add support for synchronization session management
Merge remote-tracking branch 'origin/master'