am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev

* commit 'fcc42e8f3375a35dfc92af41fe9303359af84626':
  Fix issue #17661444: Persistent service not automatically restarted