am 7a53dbb5: Cumulative patch from commit 57e832de37ea0a82e650d8230457e0868a01b72e

* commit '7a53dbb56693ee9f55c0cab1a8297436511e8613':
  Cumulative patch from commit 57e832de37ea0a82e650d8230457e0868a01b72e