Imported Upstream version 2.4.0
Merge tag 'upstream/2.4.0'

Upstream version 2.4.0
log changes