Merge MR83 for real
The last MR accidentally merged everything but MR83, and squashed commits, which messes up git history when doing a merge.
This one merges MR83, and won't be squashed.
Build succeeds. The only change is to add Werror, so I won't rerun tests.