Issue #29044: Merge 3.6.