@shacker Can we try wrapping this in a feature flag as well?