Merge branch 'master' into US10
paulkim6 jcheng26: Brush up on Inventory tests
Merge branch 'US10'