Merge branch 'release/7'
Merge branch 'master' into develop