Merge branch 'jn/shell-disable-interactive' into next