am 7f0b69e8: Cumulative patch from commit e8c08c9a363340c45baf8e13c758c99078bc0d8b

* commit '7f0b69e88015ca077ef7a417fde0a76c10df23a5':
  Cumulative patch from commit e8c08c9a363340c45baf8e13c758c99078bc0d8b