fix kpi parent
Merge branch 'feature_kpi'