Merge "save file block allocations in target_files" into lmp-dev