Release 2 7

Merge in Remaining changes from Release 2.7