Merge branch 'jk/shell-portability'