Merge "Add Swagger Related Configurations"