merge tizen branch