Merge "Add network wrapper method checks"