Merge branch 'main' into bump-version