Merge branch 'update_qty_rate' into develop