Issue 4832: switch rate unit
Issue 4832: switch rate unit for each commission formula