Merge "Add new shelve compute feature flag"