Commit ee4b80a6 authored Jun 17, 2022 by Tom Rini

Merge branch '2022-06-16-assorted-bugfixes'

- A wide array of regression fixes and minor updates