Merge "handle swagger part"