Add feature flag; disabled by default.