Fuller fix for ENYO-1697

This pulls in the Ares. Proxy change as well as the change you made to how to solve the published problem.