Merge changes from topic "ns05" into sc-dev

* changes:
  [NS06] Implement the don't-reap mechanism
  [NS05] Feed network offer callbacks