am a3dc3096: Cumulative patch from commit f43c1ae7989c38fe15756f12a9196a1cf798b4d7

* commit 'a3dc30964aa24aea2b518246f6812663a1103490':
  Cumulative patch from commit f43c1ae7989c38fe15756f12a9196a1cf798b4d7