Merge changes I720a1feb,I9539b8cc,Ib79b777b

* changes:
  [NS A17] Update linger state after rematching.
  [NS A16] Cleanup
  [NS A15] Move legacy default broadcasts out of the loop