Merge branch 'ab/fix-poison-tests'