new comp design
new comp design
Merge branch 'new-comp' into build-28