Improved handing of dataset imports formt he console.
Merge branch 'test' into dev