am 1f6cf5fa: Merge "Re-use existing thread" into jb-mr1.1-dev

* commit '1f6cf5fade6021c1ce788541ec4a60ee36d20651':
  Re-use existing thread