Upstream merge, and fix up regex filtering