Update from master

Squashed commit of the following:

commit 40cc37ef
Author: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
Date:   Tue Mar 7 11:01:46 2023 +0530

    Fix Bug 2219 - NG-UI remains stuck when showing a VIM created from the CLI

    	- For Info part in VIM, UI will check for location value mandatorily.
    	  Fixed this by adding condition to check null or undefined values before going inside location values loop.

    Change-Id: I8ff265aa364b41131b3e99d3712e964b94f05aa8
    Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>

Change-Id: I9ed23326656f3fc42408dea4869d70616efe6a6f
Signed-off-by: Dario Faccin <dario.faccin@canonical.com>