Warning on img repairs.
Merge branch 'test' into dev