Merge branch '2.7.x' into 2.7.0-release