Fix struct conversion.
Merge branch '0.20.x'