fix kpi
Merge branch 'feature_kpi'