Merge "Support 3.7.0" into idea133