Intermediate version of site. (cherry picked from commit 6abbe32)