Merge "Update release-notes"