logger:backport from CAF