Support urls without rewrite.
Merge commit 'cec4b6790270ca7f3acb620e1d4459e1f50b0ab3'