GitHub: Review PR #6601