Merge from beta branch.