GitHub: Review PR #3587