Merge from private branch in preparation of 2.7 rc1