Windows related fixes
Merge local and remote branches