Merge branch 'jc/test-lazy-prereq' (early part)