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