Merge "Restore "Fix an assertion triggered when using anonymous structs in kernel""