Update and rename Changelog.021 to Changelog.036