(Issue #3747) review follow up