am 8cfe752a: Merge "misc fix"

* commit '8cfe752a64222225f3199da5feff6664628590c9':
  misc fix