Merge "Fix pointer index when splitting secondary pointers." into gingerbread