Merge "[automerger skipped] Remove failing test am: 324b598339 -s ours" into main