Merge from beta.