Merge branch 'ps/grep-help-all-callback-arg'