Merge "DCAE updates for R4"