Merge "New version of api-generator tool"