Specify image origin
Use default image origin=PARENT where possible
Merge branch 'tickets/DM-1176'