GitHub: Review PR #3586