Merge "Several orchestration fixes"