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