before deactivations
extra features deactivated
before merge
merged branch v0.6