removed prefix for matching both http and https protocol
Merge branch 'cp0' into cp3