Working on the Merchant BI
Merge branch 'jm_working'