Only rewrite http and https
Merge branch 'production' into test