Merge branch 'release/3.6.0'
no message
Merge branch 'hotfix/3.7.0' into develop