Support the following changes when they merge: * https://github.com/oxidecomputer/omicron/pull/9430
Support the following changes when they merge: