Merge branch '2022-03-08-assorted-fixes'

- serial uclass fix, mailmap/gitignore updates