Fixed zero-initialization of nested structs, part1
Fixed zero-initialization of nested structs, part2