JBIDE-13381 merge