Merge branch 'main' into finder-composer