(Issue 3551) Follow-up from review