sync with tizen branch to finalize API