Merge changes I886321ea,I3466450d

* changes:
  Reinstate blockguard checks for file reads / writes.
  Reinstate blockguard checks on network operations.