Re #1296 Fixing DataSet import problems.