Merge from newer fork.