Merge "Update create ns according to new api"