Merging phase2 changes