Merge with upstream icehouse