Merge "Fix hardcoded orchestration-status"