Merge branch 'ad-parallel-tests' into next