Design merge

Merging the design_merge into master