JBIDE-14658 with changes from fred