OOIION-1378: Data product preload enhancements
Merge pull request #1465 from mmeisinger/fix1378_pre2_r2

OOIION-1378: Data product preload enhancements /REL2.0