fixed "Hard" sync type
Merge branch 'master' into social_stream