CLUB-598. Change the clusttering of pointers.