Fix ESBJAVA-3208 - Fix done by Maninda