Merge branch 'main' into improve_reactions_section