Merge "Address review comments for release notes"