Add changes to the ChangeLog following the dev branch merge