Merged AD Sync changes from master