Merge branch "fallback_referer"