JACKAL-6246

JACKAL-6246