Upstream pull for 2.7.1-beta1