Merge "CDS integration in GR-API for self-serve"