JBIDE-12024 and  	JBIDE-13450