am 8bd70b7d: Cumulative patch from commit b4342ca4d8f21af51d4923ca15910d3211bfdc7e

* commit '8bd70b7d6ba220544ee2f0e201e5df23e277fa1d':
  Cumulative patch from commit b4342ca4d8f21af51d4923ca15910d3211bfdc7e