Backported changelog from release branch