chore(web): Merge branch 'refactor/web/matcher-abstraction' into feat/web/config-shifting-and-source-rigor