Test: spawn ccm using cmd process instead of python
Merge branch '2.1'