Update to icehouse