am 37d4d6a4: Accumulative patch from commit 52728dcd25b5074fb7c0493a8155f096089ad6d0

* commit '37d4d6a4efea4ef4f864347ac8ed8d62a9e19f90':
  Accumulative patch from commit 52728dcd25b5074fb7c0493a8155f096089ad6d0