(Issue 3460) Review followup