am 444d567b: Accumulative patch from commit 17b8995cf5813d7c027cd7a6884700e791d72392

* commit '444d567b27731d8572ef37697dd12fd1c37c2f24':
  Accumulative patch from commit 17b8995cf5813d7c027cd7a6884700e791d72392