am 1e78e769: Accumulative patch from commit 88c8bf311efa4eb64468bed9b41b3110ab9effff

* commit '1e78e76961664775f58b139f8c6388cfa0485f3d':
  Accumulative patch from commit 88c8bf311efa4eb64468bed9b41b3110ab9effff