WIP: 2.1 changelog changes

Might as well just wait until 2.1 is done to merge this but creating as a reminder to update changelog at some point before 2.1 release.