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