Merge branch 'release/3.6.0' into develop
Change sbt web dependency version
Self compile
Merge branch 'release/3.7.0'