Imported Upstream version 2.3.4-2
Merge tag 'upstream/2.3.4-2'

Upstream version 2.3.4-2
Update changelog