am 9ead16e2: Cumulative patch from commit d5fe4e6c18d94465e8fb4527d51df6e8539c4d6a

* commit '9ead16e203b81d44a2d84eadc2901ceeb7daf805':
  Cumulative patch from commit d5fe4e6c18d94465e8fb4527d51df6e8539c4d6a