Merge changes I904d87c0,I9ef468a1

* changes:
  [NS A25] Send all listen callbacks after all rematches
  [NS A24] Add an object to represent changes in assignment