Imported Upstream version 1.2.23
Merge tag 'upstream/1.2.23'

Upstream version 1.2.23
update changelog for 1.2.23-1