Merge Windows CPU code from master.