Conflict-fixing rebase of #1064 (Download image metadata develop)

This PR is @jburel work rebased on top of develop with all conflicts resolved.