Merge branch 'main' into improve-human-added-attribution-docs