Merge "Fix scissor for functor invocation" into klp-dev