Merge "Add metrics for DPC setup"