am 40489be9: am 61158244: Merge "Implement issue #10691359: Kill long-running processes" into klp-dev

* commit '40489be90b7c145da75034f793932500f0e5d380':
  Implement issue #10691359: Kill long-running processes