Bump to version 3.0.4
Update changelog
Merge branch 'release-3.0.4' into develop