CAMEL-6676Applied the patch with thanks to Dhiraj