Protect path filtering from wrong positives. Or we would fail many
requests involving "One Republic" etc.
Merge branch 'public/7.7' into public/7.8
Merge branch 'public/7.8' into public/7.9