Fix bug WEBSITE-2112
Merge branches 'bug/WEBSITES-2112' and 'redesign' into redesign