Merge branch 'jc/test-prereq-validate'