Merge branch 'jc/maint-apply-match-beginning'