Upgrade to V2.7

Reviewer: @aogilvie