backport of JBIDE-14913 to beta2 from master