Merge branch 'chore/add-cc-by-4' into 'develop'