Merge branch 'tor-github/pr/1898'