Migration to 2.8

This branch is rebased over the 2.6 migration branch.