am b1d65d18: Merge "Fix runtime restart" into lmp-dev

* commit 'b1d65d187db52c541ac71b5b9e3f34f15eb3001f':
  Fix runtime restart