Update changelog
Put back lost commits FR #4178