So a wrench in the process. HeaderTests had some failures. Looking into it, a lot of macro calls do not have a trailing semicolon. clang-format goes a little greedy with this and starts indenting things. I’m currently going through and adding semicolons everywhere it looks like they’re missing and then I’ll redo the format. I’ll try to get in early Monday to merge it, otherwise it will have to wait for some other end-of-day to conflict with just about every MR.