Resolve "'FieldInstanceTracker' object has no attribute 'saved_data'" Closes #639 See merge request !948
#52912