Merge "Add CDS client properties"