Cp is now adjustable
Merge branch 'master' into release

* master:
  Cp is now adjustable