JBIDE-18262 - revised