GitHub: Review PR #3118