2021-11-13 merge staging/next into next

Nothing really important, but still changes which make sense. One potential bug fix, but I doubt we actually hit it.