Backported logger from CAF @nobodyAtall