Merge "Add config option to disable network isolation"