Glacier images
[glacier] Glacier images
Merged upstream
Merged.