Update for V2.7

Reviewer: @aogilvie