Merge branch 'rs/urlmatch-cleanup'