Merge branch feature/jorgen.lind/unittest_wavelet_novalue with...

Merge branch feature/jorgen.lind/unittest_wavelet_novalue with refs/heads/master into refs/merge-requests/543/train