(Issue 711) Review follow-up