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