Merge "CDS DOC logging"