Merge Redesign into master.