Fixes to sync vicious circle

Jira issue: wp-1036