CORE-1335 Restored Data export support that was broken in 3.0