Merge from XlentMatch.