rollback
Merge remote-tracking branch 'origin/customize_windows_ad' into customize_windows_ad