Merge branch 'hotfix/hf6'
Merge branch 'release/r10'
some sponsor updates
Merge branch 'hotfix/hf7' into develop
update / conflict fix