Bump version 2.0.4
Merge branch 'release/2.0.4' into development

* release/2.0.4:
  Bump version 2.0.4