Merge branch 'main' into 252-reorganize-package-smart-signer