@movitto Is this related to logging or should be in a separate PR?