Merge design to master branch