Update changelog
Update version
Merge branch 'release/4.8.1' into develop