Merge "For DataLake DCAE handler"