SYNC-1180

This needs to be backported into 6.2.x