Sync with collaborator-3