Merge "Add temporary functor lifetime logging" into jb-dev