Merge branch 'test-autolaunch-win' into 'master'