Merge pointer change from 3.0