Merge "Fix invalid memory access" into tizen