Merge branch 'jc/no-slim-shell' into next