Merge remote-tracking branch 'origin/pr/33' into windows-integration