Merged from beta.

tracker 24764