fix MOL-177: Fix logging
11 files changed