Update to 4.3.1
Merge windows changes