Merge from preempt branch.