Fix ESBJAVA-3284 - Patch provided by Ravi