Bump version to 2.8.0.4
Merge branch 'release/2.8.0.4' into develop