Merge "Fix security issue" into tizen