broke out a data loading tool from unit tests
Merge branch 'master' into UI_30