TIZEN: backport master changes