2.6 Migration Guide