am 53760b4a: am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev

* commit '53760b4a97fb2f88e94da73d647ff80221b3c454':
  Fix scissor for functor invocation