Fix pointer issue
Merge remote-tracking branch 'upstream/master'