Merge "Rollback Scenario for recursive orchestration"