Merge branch 'dev-redesign' into dev