Merge pull request #7723 from freedomofpress/7707-source-conversation…

Merge pull request #7723 from freedomofpress/7707-source-conversation… #197