Merge branch 'lc/shell-default-value-noexpand' into maint