I replied in more detail under another comment. TLDR: fixing flaky CI across multiple branches