Merge "dcae r6 doc updates cont."