Merge "Fix Matcher.find and reset"