This cherry-picked the website-related commits to enable us to release the website before merging v6.