upped version & changelog
Merge branch 'release/v5.0.4' into develop