Merge branch 'ws/grep-quiet-no-pager' into maint