Merge changes from submission to phase2