Merge "Add more temporary logging for investigating detachFunctor" into jb-dev