Issue #29145: Merge test from 3.6