Release version 3.0.4.0
Merge branch 'release/3.0.4.0' into develop