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

* commit '61158244b42df547ecf8ca145d539c814b154a4a':
  Implement issue #10691359: Kill long-running processes