Merge branch 'preempt' into release