Issue #15812: Merge from 3.5