Zit 3152
Fix Bug For comp312
Comp 1783 Range Check Error
Zit3153
Merge branch 'Bug_comp_1783'
Merge branch 'Zit3152'
Merge branch 'Zit3153'
Merge branch 'master' of https://github.com/distributor/Distributor.Client