Add changelog entries for #2609