cleanup: git-extract tests
cleanup: git hack
Merge branch 'master' into cr-removeSyncDuplication