Merge "update release-note"