Merge "external network creation fix"