merge tizen 2.4