merge updates from release/2.7 as it is merged into master