Imported Upstream version 2.0.4
Merge tag 'upstream/2.0.4'

Upstream version 2.0.4
updated changelog