Dmitriy/client refactoring

Andrey Veltischev requested to merge dmitriy/client_update into master

Merge request reports