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