Merge "DO NOT MERGE :CDD Annotation for section 3.8.6" into pie-cts-dev