(Issue 3403) Follow up on review