Use default image origin=PARENT when possible
Restore one image origin to local
Merge branch 'tickets/DM-1176'