SOL005 NS Lifecycle Management - Implementation of deltas between v3.6.1 and v3.5.1 See merge request !253