Cody sync.: merge tizen 2.4 code from spin git