am 4171258d: Cumulative patch from commit 8c43ef8449bd4d2d0983db394770bd73f572b12d

* commit '4171258d30a612645aa061cede62233b5c58ca2a':
  Cumulative patch from commit 8c43ef8449bd4d2d0983db394770bd73f572b12d