Use new default image origin of PARENT when possible
Merge branch 'tickets/DM-1176'