* chore: [31-x-y] cherry-pick 2 changes from 3-M129 * 9542895cdd3d from v8 * 81155a8f3b20 from v8 * chore: update patches