Merge "correct release note"