Merge "Fix DPC test" into main