Merge changes Ic1a5d032,I271e7f4d,I7af37281

* changes:
  [NS A39] Simplification
  [NS A38] Fill the initial reassignment
  [NS A37] Don't reassign requests multiple times