Merge remote-tracking branch 'origin/full-images'