Fix/3.m/2475 clientproxy resourcecleanup

Fixes #2475