Merge "Extend ixnet api"