Merge "On new content, attach functor directly" into jb-dev