Merge "Chsnge to OpenApi 3.0"