Merge branch 'cb/test-use-ere-for-alternation'