Merge changes from design branch