Bjoern Eiben

Have fixed the compilation error and successfully tested for comparable results on Windows and Linux (VM). CI-pipeline on gitlab now stuck with missing Mac-build. @mmodat can you check that you...

In the meantime, some merge conflicts came up which are now solved. Can you have a look and merge, please?