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

tagging