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