Merge Alex's reduced data copying commits + some import fixes and a test