Merge branch 'feature-windows-support' into develop