JBIDE-15392 - modified to work with recent changes for JBIDE-15478