Merge branch 'nd/grep-exclude-standard-help-fix' into maint