Merge "Fix dereference issues" into tizen