Merge branch 'fm/shell-path-whitespace' into maint