Fixes to shipping/summary/confirmation
Merge remote-tracking branch 'origin/Saumya'