Remove matchers and cherry pick changes from 3.3.2