(Issue 3572) Review followup