Merge "Sanity-check paths of files to be restored" into lmp-dev