[Core] Address zone based price calculator
Merge pull request #1932 from stloyd/feature/zone_pricing

[Core] Address zone based price calculator