Merge branch 'pcc' into release