Merge branch 'release/3.0.4'
Merge tag '3.0.4' into develop

re-tagging 3.0.4