SOL005 NS Performance Management - Implementation of deltas between v3.5.1 and v3.3.1 See merge request !202