Issue #27430: Merge from 3.5