OOIION-1378: Data product preload enhancements
Merge pull request #1464 from mmeisinger/fix1378_pre2_m

OOIION-1378: Data product preload enhancements