Fix MultipleObjectsReturned on second resolve try.
See merge request !6330 (merged)
(cherry picked from commit e1b41019)
e342281e Fix MultipleObjectsReturned on second resolve try. 5fa79e5a Check model has checkpoint attribute on get_checkpoint 0030af4a No save state for empty incremental.