Merge "Also consider secondary storage when verifying paths" into lmp-dev