Specify image origin explicitly
Use default instead of explicit origin=PARENT
Merge branch 'tickets/DM-1176'