Issue #27539: Merge from 3.5.