bug-2161
Merge branch 'bug-2161' into dev
Merge branch 'dev' of https://github.com/distributor/Distributor.Client into dev