Fix an issue with sync, where some ObjectIds weren't added soon enough
Merge branch 'sync-fix'

* sync-fix:
  Fix an issue with sync, where some ObjectIds weren't added soon enough