Merge branch 'seckey-sync-work' into master