adding occasional yield in long-running queries when eval'ing
Merge branch 'next' into sam_alt