Changelogs re #870, #871