am a7b06faf: Cumulative patch to Release 2.3

* commit 'a7b06faf528d1765cc2712cc9a31ad45d7c3110b':
  Cumulative patch to Release 2.3