(Issue 732) Review followup