Merge "Revert "Revert "Revert "Revert "Turn on the feature flag for And..."" into sc-dev