Merge WINDOWSstd with WINDOWSmain