Merge changes I195d894e,I7069c111

* changes:
  [NS A10] Cleanup
  [NS A09] Always rematch all networks to requests