Merge branch 'feature/fix-logging' into next