Fix customers bypassing freight calculations
Merge remote-tracking branch 'origin/master' into Stable