paulkim6, jcheng26: Created merge point