Merge "CDS Fix Swagger issues"