Merge branch 'cb/do-not-use-test-cmp-with-a'