Merge branch 'ja/perf-use-specified-shell'