Merge changes I195d894e,I7069c111

* changes:
  [NS A10] Cleanup
  [NS A09] Always rematch all networks to requests
tree: 139b612026f048bc46b0f744de04b8984e4b5c10
  1. core/
  2. services/
  3. tests/