Merged with Tizen Branch ( builds )