SYNC-279 - Follow-up comments