2.7.1 dev into 2.7.1-dev-SOL005-NSPM

Najam UI Hassanrequested to merge
2.7.1-dev into 2.7.1-dev-SOL005-NSPerformanceManagement-API

Integrate frank changes in SOL005 NSPM

Merge request reports