fixup! Add support for feature toggles
fixup! Document feature toggles