Merge "Cleanup attachFunctor"