am 2e425d69: Cumulative patch from commits: a7f5271 and 7465640

* commit '2e425d69801667e42b4874548f2a49dc16e95617':
  Cumulative patch from commits: a7f5271 and 7465640