Merge "Add support for CDS basic-auth"