Merging ehd into starfoundry