Merge branch 'release/3.7.0'