Fixed Commodity Location
Merge branch 'hotfix/3.5.3'