am 9c7165d4: More logging improvements

* commit '9c7165d4c6b90101b781f90b17451efd42a17929':
  More logging improvements