Issue #29239: Merge bug number from 3.6