Fix struct casts to align fields by name (prevent positional mis-casts)

Fix struct casts to align fields by name (prevent positional mis-casts) #22908