merged and resolved conflicts for TWith2Sugars-windows branch