Cherry-pick of 1c33fc93 on 0.6.1#622

marosset merged 1 commit intohyperlight-dev:release/v0.6.1hyperlight-dev/hyperlight:release/v0.6.1from

marosset:1c33fc93-on-0.6.1marosset/hyperlight:1c33fc93-on-0.6.1Copy head branch name to clipboard