Merge branch 'redesign' into ab-testing-redesign