Merge branch 'jn/shell-disable-interactive'