Merge "Add CDS auth property"