Merge branch 'dd/t5703-grep-a-fix'