Icehouse Support

Bring updates to support Icehouse release.