Issue #29123: Merge from 3.5