am 822bbb38: Merge "Make attachFunctor blocking"

* commit '822bbb382fa6b6c8d1b45770e27c2c2732a7afb7':
  Make attachFunctor blocking