synchronize with 3.7.0 version
1256 files changed