Merge "Register functor draw correctly"