Create dataset instead of activate persistence
Merge pull request #1960 from mmeisinger/fix1789_calib_r2

OOIION-1789: Create dataset instead of activate persistence