GitHub: Review PR #6590