Merge official branch.