Merge "Allow images to be readded to target-files" into lmp-dev