Merge "rkp: pull out remaining CDDL and make compliant" into main