Ensure only enabled adjacent equivs are reintroduced to the resolved
Merge branch 'filter-equivs' into stage

* filter-equivs:
  Ensure only enabled adjacent equivs are reintroduced to the resolved