Merge pull request #996 from david22swan/maint/main/max_changelog