post merge compilation fixes
cpp_v2 - clear in read will not be called for empty structs