Merge "Update/Fix CDS property"