Merge "Move CDDL into separate CDDL files" into main