TS-54 Logging unification