Add additional 2.6/2.6.1 changes.