Imported Upstream version 4.0.10
Merge tag 'upstream/4.0.10'

Upstream version 4.0.10
Update changelog