Forgot to update Changelog with the last fix
Merge branch 'master' into web-client-fixes
Forgot to update Changelog with the last fixes