Merge conflict fix 904743ff2
Update changelog