Issues #29349: Merge Py 2 fix 3.6