Imported Upstream version 1.12.3
Merge tag 'upstream/1.12.3'

Upstream version 1.12.3