bump the version
Merge branch 'release/2.0.4' into dev