Icehouse Support

Bring updates to support Icehous release.

WIP, do not merge.