finish match_clp
Merge branch 'match_clp' into dev