Merge "Fix logging" into lmp-dev