chore: cherry-pick main commits to resolve dev conflicts (unblocks #360)#368

AugustoL merged 2 commits into

openscan-explorer:devopenscan-explorer/explorer:devfrom

AugustoL:chore/merge-main-into-devAugustoL/explorer:chore/merge-main-into-devCopy head branch name to clipboard