Merge: contrib/re_parser