Merge "store images in target-files" into lmp-dev