Merge "NS update swagger definition error"