adding kpi and salesforce
merged
merged fixes