Merge "Add CDS client timeout property"