After merge fixes. Now code compiles, but there is still some valgrind warnings that needs to be fixed
Attach a file by drag & drop or click to upload