This MR brings main to the 6-freebsd-12 branch after main was taken back to the merge-base.
main
6-freebsd-12