UC-1596:  Unified Proxy Plugin implementation