- Patch #503496 by deekayen, boombatower, Dave Reid: better sid generation in tests to help us make progress on PIFR 2.x