Merge "Handle v4-mapped v6 address in Struct parsing" into main