Merge "Removed unused getZoneHandlerUrl() method"