Merge "[BUG] Fix for Swagger UI generation"