TA17444 Update proxy classes
code reviewer DMartynov