Merge "Fix uninitialized member warning"