Merge "never attach null functor" into jb-dev