(Issue 655) Review followup