Create new version
Merge branch 'master' into cc_security_fix