Split full and partial sync
Merge branch 'master' into builds
7.468