stripped schema part
Merge branch 'design/welcome' into develop