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

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