Merge "Add/update elalto branch for dcae"