Self compile
Merge branch 'release/3.7.0' into develop