Merge "Add new rescue compute feature flag"