cherry pick changes from 3.0#104

yepmunchun merged 2 commits into3.0-devopen-edge-platform/edge-microvisor-toolkit:3.0-devfrom

anujm/3.0-devopen-edge-platform/edge-microvisor-toolkit:anujm/3.0-devCopy head branch name to clipboard