Merge the changes to junbo/swagger-core