JBIDE-15357 part 2 with test