CLC-1245  Added proxy and unit tests