Merge branch 'search-and-commit-api' into main