Items #530, 531, 532
Merge pull request #719 from Reformant/reseller_v1

Items #530, 531, 532