Merge "Fix failing tests that are blocking OOM investigation" into main