am 4c72e8d9: am a7b06faf: Cumulative patch to Release 2.3

* commit '4c72e8d9f2c0659b38b51fe682a12b6d3ff1eaf1':
  Cumulative patch to Release 2.3