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