Merge changes If71fadd2,I42047185

* changes:
  [MS10] Address leftover comments on MS03 and MS07
  [MS09] Implement isSameNetwork.
tree: dee1c4aabcbacb401c8cb9a9f5b034b127ef87d4
  1. core/
  2. services/
  3. tests/