Merge live repo with design changes ccsdk-2309