SOL005 NS Lifecycle Management - Implementation of deltas between v3.3.1 and v2.7.1 See merge request !166