Merge branch 'km/avoid-bs-in-shell-glob' into maint