Merge "Fixed send_broadcast and fork handling issues." into nyc-dev
am: 8e48e0a

* commit '8e48e0aadae765b4ed104890ca33db32ea347a8a':
  Fixed send_broadcast and fork handling issues.