Data-load script updates from Master branch

Merge request reports

Loading