Merge "Fix bug in DC override flag." into main