Cumulative patch from commit 21cb63fffd1e766c8b989125394ed0bfb05e5a4b
am: de47be7503

* commit 'de47be75037bccd4a11b62eedb3d4aed1b36fa67':
  Cumulative patch from commit 21cb63fffd1e766c8b989125394ed0bfb05e5a4b