Merge branch 'rr/test-use-shell-path-not-shell' into maint