Merge pull request #3443 from jonasfj/master

Merge CP into master