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