Bump version to v2.0.4.
Merge branch 'release/v2.0.4' into develop