(Issue #3712) Review followup