robustify the gateway utils gateway resolver and remove it from the gateway master api.