Merge branch 'ab/test-bail'