Resolve "KPI Management Enhancements"

Waleed Akbarrequested to merge
feat/178-kpi-management-enhancements into develop

Closes #176 (closed) and #178 (closed)

Edited by Lluis Gifre Renom

Merge request reports