Merge "Fix release notes"