Merge branch 'no-ccap'