Merge "A couple of restore fixes:" into lmp-dev