Merge "Fix runtime restart" into lmp-dev