GitHub: Review PR #3110