bumping version
Merge branch 'release/3.0.4' into develop