OGM-545

As far as I understand, it is used only for logging so it should not really matter, eventually we can change it as a separate issue/commit