Merge "Make attachFunctor blocking"