Merge "Handle null orchestration-status"