MT#4597 fix ID/name association for resellers
1.8.3
Merge branch 'master' into 1.8