Merge branch '2021-09-03-xyz-modem-fixes' into next

- Assorted x/y/z modem fixes from Pali