Merge branch 'nb/ccg'