Merge "Fix attachFunctor path to ignore delay" into jb-dev