Merge branch '2.7.0-release'