JAGGER-2523

JAGGER-2523