Fix merge conflict in windows 1.8.11 (#2608)
Fix merge conflict in windows 1.8.11 (#2608)


rjtsdl/acs-engine,Azure/acs-engine,rjtsdl/acs-engine,Azure/acs-engine,rjtsdl/acs-engine,jackfrancis/acs-engine,rjtsdl/acs-engine,jackfrancis/acs-engine,rjtsdl/acs-engine,jackfrancis/acs-engine,Azure/acs-engine,jackfrancis/acs-engine,jackfrancis/acs-engine,Azure/acs-engine,Azure/acs-engine