Merge "Fix unmarshalling errors"