cherry pick + merge
Merge pull request #38 from kerautret/TestCP

cherry pick + merge