Merge "base: Fix bitstruct bug with assigning fields"