Merging phase1 to trunk