Issue/2785 fixes lumberjack

Fixes #2785

**Note:**
We've opened another Pull Request (instead of cherry pick) because there were conflicts, and our goal is to keep this change as clean as possible.

/cc @bummytime may i bother you with a violent review?