Offline Image Transfers #1155
Merge remote-tracking branch 'origin/master' into 'origin/1155-offline-image-transfer'