Update the master branch to provide a working CI again and small changes since last merge from branch 'refactor'