Merge "CDS add Swagger annotations for BP Model API"