Merge branch 'main' into ci/fix-network-simulator-binary