Merge "Minor restore fixes" into lmp-dev