KCC UI Kit merge 3/12/2014