Merge branch 'bw/spawn-via-shell-path'