Merge from 3.5 for issue #26664