Merge change 199

* changes:
  Updated comments around thread exit check.