Zit 3183
Merge branch 'Zit3183' into dev
Merge branch 'dev' of https://github.com/distributor/Distributor.Client into dev