Merged from beta.