proxy support changes
proxy unit test reference implementation