Merge "Fix functor removal"