CC-06
CC-06 merging with design