paulkim6 jcheng26: Merge branch 'US5-phase2'