Issue #19234: Merge from 3.5