Merge branch 'redesign'