Merge new content from design to master