Merge "Changelog: Add Blade changes and fix a typo" into gingerbread