Imported Upstream version 2.3
Merge tag 'upstream/2.3'

Upstream version 2.3