Issue with BeginEdit() and CancelEdit()

We have run across an issue with BeginEdit() and CancelEdit() with regards to lazy loaded parents where the backup index is off when canceling.

In the BeginEditInternal() code below, you are only adding the toOneModel entity to backup if it is not lazy (see bolded code below).

foreach (var toOneModel in TypeModel.ToOneModels)
{
    Entity entity;

    if (_unitOfWork != null && _unitOfWork.Context.GetCompatibilitySetting(LightSpeedCompatibilityOptions.EnableCandidateFixes))
    {
        entity = toOneModel.GetHeldValueIfNotLazy(this);
        **if (entity == null) continue**;
    }
    else
    {
        entity = toOneModel.GetHeldValue(this);
    }

    **_backup[i++] = entity;**

    if (entity != null)
    {
        entity.BeginEdit();
    }
}

However, in the CancelEdit() code below you are assuming the entity was added to the backup regardless of whether or not it is lazy. This causes the indexing to be off and the entity pulled from the backup will be the wrong entity if it was lazy loaded.

foreach (var toOneModel in TypeModel.ToOneModels)
    {
        **var entity = (Entity)_backup[i++];**

        toOneModel.SetHeldValue(this, entity);

        if (entity != null)
        {
            entity.CancelEdit();
        }
        else
        {
            toOneModel.SetLazy(this);
        }
    }

Let me know if you need more information.

Thanks, Matt