Merge "Fix the DCAE integration Bugs"