fixes to avoid copying the same image in the repository multiple times
Merge remote-tracking branch 'origin/1.00.04.1' into 1.00.04.1