* Fix #35768 * Fix #36064 * Fix #36051 * Fix cherry-pick panic
And by the way, remove the legacy TODO, split large functions into small ones, and add more tests