Merge "restore if tag from cond tag" into tizen_2.2