ESBJAVA-3222 by IsuruU