Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maint