Merge changes I56109847,I7d815f87,Ic9a3d336

* changes:
  [NS D07] Use the unmodified legacy score
  [NS D06] Implement more policies
  [NS D05] Rework how to tear down networks