Residential shipping variable work
Merge branch 'stable_gwm' of https://github.com/er777/gb into stable_gwm