Glacier support

Change-Id: Ia2e5c5bbdcd7202df21e083b4038f105d2214c35