Track pull request 8837