JBIDE-13662 part 2