Merge "[DPP R2] Support for DPP R2"