Bug 2176
Merge branch 'Bug2176' into dev
Merge branch 'dev' of https://github.com/distributor/Distributor.Client into dev