Merge branch 'issue#4048' into 'develop'

Corrected some errors in our import process.

Closes #4048

See merge request !3854
Status Job ID Name Coverage
  Unit
passed #6674
phpunit

00:00:58

 
  Acceptance
passed #6675
juice
codeception

00:05:06