proxying handled in client side + small changes

Merge request reports

Loading