Update changelogs for the upcoming release
2.3.6