Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'