Backport25/newmatcher