Merge branch feature/morten.ofstad/FixUnbinnedPrestackImport with...

Merge branch feature/morten.ofstad/FixUnbinnedPrestackImport with refs/heads/master into refs/merge-requests/382/train