Merge branch 'mh/http-urlmatch-cleanup'