Merge commit '26d5786fb1a43d82b40fa908e1220a018b748c93' * commit '26d5786fb1a43d82b40fa908e1220a018b748c93': Fix pointer index when splitting secondary pointers.
Merge commit '26d5786fb1a43d82b40fa908e1220a018b748c93' * commit '26d5786fb1a43d82b40fa908e1220a018b748c93': Fix pointer index when splitting secondary pointers.