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

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