Merge pull request #2895 from TheBlueMatt/2024-02-logging-tweaks