Hi John,
Maintaining an extra branch is unsustainable, but we can keep the FB version as an ancestor.
The new o2 pads UDTs correctly, in compliance with C, and treats numeric equates as 32bit values by default, which required some adjustments to the include files.