Re #7699 Fix issue with loaded data
Merge remote-tracking branch 'origin/feature/7699_fix_eqsans_preloaded'