Merge AD sync changes from master