Issue #18548: Merge from 3.5