The actual change when this started happening was to move from EAGER to LAZY for both Address.Version, and to make them optional=true.