Merge Sherry changes