(Issue 3572) Review followup, incorporate Issue #3535