JBIDE-14583 to beta1