sync with tizen branch for bug fix