fixed issue with external network instances
Merge branch 'master' into working_admin