[NUCCORE-1097] Genericise Extent