Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into pie-cts-dev