Merge branch 'cb/test-lint-cp-a'