ESBJAVA-3114 by Gokul