am 596e409e: Merge "Work on issue #11634365: Leaking restarting services" into klp-dev

* commit '596e409ec9703e5071bb9a0de08787cde7745f7a':
  Work on issue #11634365: Leaking restarting services