Merge: from main When testing on main, suddenly discovered that 3rd test batch run would produce an error. Tests: ran CompanionServerTests multiple times, 2 green batches, 1 red (on teardown) - will fix in next CL