JBIDE-14012: third attempt