Initial commit to merge.
Merged with matcher_detail.