Merge branch 'jc/maint-log-grep-all-match-1' into maint