Merge "[CDS] Update the CDS blueprintprocessor"