Merge branch 'hotfix/cfp'
Merge branch 'release/r6'
news update
Merge branch 'hotfix/hf3' into develop