XX-11059 - Restore fails when device_version_id is NULL