Merge branch 'prereqs2' into dt-test