Merge "Remove orchestration scenarios"