Merge branch 'ep/avoid-test-a-o'