Update changelog with latest changes
Merge branch 'changelog-update-2' into develop

* changelog-update-2:
  Update changelog with latest changes