Merge "Don't clear the functor at every draw" into jb-dev