Merge "fix  warning: struct argument contains uninitialized data"