Merged from origin.