Merged from design