Merge branch 'rj/maint-grep-remove-redundant-test' into maint